From 195bebb4809fd96dd66ff440a2e1b3514227a223 Mon Sep 17 00:00:00 2001 From: Mat Date: Thu, 26 Mar 2020 19:06:15 +0200 Subject: Disable bonemealable settings for now (#4551) --- src/World.cpp | 4 ++++ src/World.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/World.cpp b/src/World.cpp index 13b544a78..d8655ce11 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -193,6 +193,7 @@ cWorld::cWorld( m_MinThunderStormTicks(3600), // 3 real-world minutes -+ m_MaxCactusHeight(3), m_MaxSugarcaneHeight(4), + /* TODO: Enable when functionality exists again m_IsBeetrootsBonemealable(true), m_IsCactusBonemealable(false), m_IsCarrotsBonemealable(true), @@ -207,6 +208,7 @@ cWorld::cWorld( m_IsSugarcaneBonemealable(false), m_IsBigFlowerBonemealable(true), m_IsTallGrassBonemealable(true), + */ m_bCommandBlocksEnabled(true), m_bUseChatPrefixes(false), m_TNTShrapnelLevel(slNone), @@ -282,6 +284,7 @@ cWorld::cWorld( m_StorageCompressionFactor = IniFile.GetValueSetI("Storage", "CompressionFactor", m_StorageCompressionFactor); m_MaxCactusHeight = IniFile.GetValueSetI("Plants", "MaxCactusHeight", 3); m_MaxSugarcaneHeight = IniFile.GetValueSetI("Plants", "MaxSugarcaneHeight", 3); + /* TODO: Enable when functionality exists again m_IsBeetrootsBonemealable = IniFile.GetValueSetB("Plants", "IsBeetrootsBonemealable", true); m_IsCactusBonemealable = IniFile.GetValueSetB("Plants", "IsCactusBonemealable", false); m_IsCarrotsBonemealable = IniFile.GetValueSetB("Plants", "IsCarrotsBonemealable", true); @@ -296,6 +299,7 @@ cWorld::cWorld( m_IsSugarcaneBonemealable = IniFile.GetValueSetB("Plants", "IsSugarcaneBonemealable", false); m_IsBigFlowerBonemealable = IniFile.GetValueSetB("Plants", "IsBigFlowerBonemealable", true); m_IsTallGrassBonemealable = IniFile.GetValueSetB("Plants", "IsTallGrassBonemealable", true); + */ m_IsDeepSnowEnabled = IniFile.GetValueSetB("Physics", "DeepSnow", true); m_ShouldLavaSpawnFire = IniFile.GetValueSetB("Physics", "ShouldLavaSpawnFire", true); int TNTShrapnelLevel = IniFile.GetValueSetI("Physics", "TNTShrapnelLevel", static_cast(slAll)); diff --git a/src/World.h b/src/World.h index 165578e07..7f6b1871d 100644 --- a/src/World.h +++ b/src/World.h @@ -1213,6 +1213,7 @@ private: int m_MaxCactusHeight; int m_MaxSugarcaneHeight; + /* TODO: Enable when functionality exists again bool m_IsBeetrootsBonemealable; bool m_IsCactusBonemealable; bool m_IsCarrotsBonemealable; @@ -1227,6 +1228,7 @@ private: bool m_IsSugarcaneBonemealable; bool m_IsBigFlowerBonemealable; bool m_IsTallGrassBonemealable; + */ /** Whether command blocks are enabled or not */ bool m_bCommandBlocksEnabled; -- cgit v1.2.3